From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 8 May 2014 09:21:34 +0000 (+0200)
Subject: workspace: Don't allow closing windows with attached modals
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2452
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3ff4277f86542420524a59ed99b6b81075c558c2;p=gnome-shell.git

workspace: Don't allow closing windows with attached modals

Modal dialogs prevent the parent from being closed in "normal mode",
so it makes sense to not allow it in the overview either.

https://bugzilla.gnome.org/show_bug.cgi?id=729886
---

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 2c49d6096..51b7e84f2 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -200,6 +200,10 @@ const WindowClone = new Lang.Class({
         this.emit('size-changed');
     },
 
+    hasAttachedDialogs: function() {
+        return this.actor.get_n_children() > 1;
+    },
+
     _doAddAttachedDialog: function(metaWin, realWin) {
         let clone = new Clutter.Clone({ source: realWin });
         clone._updateId = metaWin.connect('size-changed', Lang.bind(this, function() {
@@ -582,7 +586,8 @@ const WindowOverlay = new Lang.Class({
     },
 
     _windowCanClose: function() {
-        return this._windowClone.metaWindow.can_close();
+        return this._windowClone.metaWindow.can_close() &&
+               !this._windowClone.hasAttachedDialogs();
     },
 
     _onWindowAdded: function(workspace, win) {